fixes to rest annotation