Some more compilation stuff