batch of fixes