These 2 fixes r knocking around in the usuall places, tried and tested....