Cleaning up warnings and build inconsistencies.