Code quality: fixes, no functionality change