Fixes for the build