Last cosmetic tweaks for v0.7