Fixing More Errors