build fixes for autobuild