additional fixes for removal of ROWSECURITY_CMD stuff