A few more changes to fix auto-build