fixes for builder