v0.4 compatibility fixes