2.3 compat

Quick and dirty 2.3 updates.

I hope the API still works.