Rest_in bug fixes