Fixing some errors 2