trivial master cleanups

check-spaces and compile warning