v0.4.7 fixes added