0.4.0-rc compatibility changes