pre-v0.09 fixes