Some very small tweaks