Additional fixes for PR