Fixed bugs from my last commit