Fixes related to rest