A few minor fixes...