Tweaks for v0.097