a batch of fixes