Small fixes related to atomic rest.