Develop fixes

In trying to (finally) rebase the GET param improvements, I stumbled upon a couple compilation issues in develop.