Fix white-space and warnings.