Fixing some errors...