Some more small changes to get the build to work correctly.