Fixes for PR 2017