More 0.2 compatibility hacks