Final fixes for SQL execution