Various minor fixes for non-core files.