Bring 0.4 up to date