Small tweaks

Just done a few small tweaks.