Wee more fixes to the same code over and over.