Integration stuff, and a couple of issues closed