Fixes compling issues