508 minor fixes