CONN-727: POM and SQL corrections