Fixes for linting failures