Don't worry about those 2 things. All they'll do is delay your application a few more months. A friend of mine applied the same time as I did. He was accepted in 6 months. I was accepted just under 1 year because I had a criminal background and tattoo problems. As well I was truthful on my application and said when I was younger, I did some pretty heavy drugs.
If I got in with all of that, you'll be fine! But yea, don't do any kind of drug anymore, it's zero tolerance, and plus, drugs are bad.
Good luck and Cheers