release mode fixes