A couple of fixes and stuff