Small tweaks and changes