Other minor fixes...