Add back -O2
More lint cleanups