Style fixes for sql package