Some more (minor) fixes...