Fixes requested in PR