fixes spotted by Martin