Small tweaks here and there