SQL alignment fixes from pull request comments