Build automation fixes