Resolve lint issues