Minors tweaks