Fixes to builder for mikepackdev