A few minor fixes and updates