fixes for PR