Fix issues with compilation