Some REST API tweaks from Justin