Minor build fixes, comments, formatting.