Rest fixes