icmake: audit fixes