Fix compilation issues in RELEASE