Revert "Minor fixes"

This reverts commit 99909967cb1d952c9633e83d489c5c645d85e5df.
Subquery support in UPDATE/INSERT