Updates before v0.4 releases