Release mode fixes