new batch of fixes