Some more compilation fixes