Fixes to bring auto_build_developement working