[rest] Small fixes