More Clean Compilation Fixes