Fixes that improve code quality