Fix lint hiccups