Fixes for PR