Patched some linter issues