Minor tweaks (for v 0.2.4)