restore 0.2 compatibility and minor tweaks