Just a few minor fixes