Staging fixes

Again, not to change, but the API would be cleaner without the options param