Various fixes

I finally fixed my previous pull request by splitting the original commit in two (made force_state_refresh sync an fixed list_obsels). In the meantime, I also made a few minor and (hopefully) non-controversial changes.