0.1 fixes tested against old/new