A couple of fixes