Fixing some mistakes from last commit