more work on 0.4 compatibility