more v0.2 compatibility fixes
fix v0.3-rc3 compatibility