another couple of fixes