Fixed a few minor niggles