Fix 0.3 compatibility issues