Fixes for OS/X and whitespace cleanup.