Fixes to build definition