last fixes in builder