MRG Backward compatibility

I'm running the test-suite of 0.12.1 and check for backward compatibility.
These are some necessary fixes. There are some more, working on it.

I'd really love to get feedback on this soon, as it is release critical.