Fixing Error msgs