some helmet fixes with builder