Fixing some failing specs - some because the specs were outdated and some actually fixing real code!