A few minor fixes