Minor modifications for Release configuration, etc.