more build fixes, accidental whitespace cleanup