Loads of Overload bug fixes