Release-mode fixes