Fixes for requests with optional objectives, and other minor fixes