508 minor fixes reviewing issues not covered by bugzillas