Make sure we always use rest frequencies when appropriate