Fixes spotted by asterite