fixes of RELEASE build