More monkey patching fixing issues