Fix builder fluid support

Builder won't build fluids if it's already present in tank in blueprint push time.

Some cleanup.