Updates due to changed in core.

I was testing my latest branch in core and wish to know if it compiles with the binding. That required a few minor changes.

@alazier @jpsim @tgoyne