Thes fixes are now no longer necessary