Add aura/sql and minor fixes