Add "noop" requests; fix bugs