Fixes to keep the build working