Fixes spotted by Istvan