Multiple compliation fixes