Small tweaks fixed