Fixes for comments on PR