More lint cleanups