Version bump
Small fixes to builder