Fixes for PR.