dev-0.2: Small tweaks