Fixes some more compilation issues