FIX minor errors
FIX #2 minor errors