Fix the build in all cases