CFY-949 small fixes/flake8