Fix some lint checks