Fixing minor bugs due to REST overhaul.