fixes to spread etc