Fixing some mistakes