Fixing some errors