Some minor fixes...