fixes spotted by James