Fixed if with hierarchy type
Fixed bootstrap compiler (check for nils)
More fixes in bootstrap