#52 fixes for builder