More lint fixes!