Small fixes

Very minor, see commit descriptions.