Fix spaces in some areas