Minor tweaks fixed