Fixes for PR Comments