Resolving new lint issues