Releasestage fixes