Removed pending_flag from a few more places