Another attempt to fix lint issues