minor changes for v0.16