A few more minor inprovements.