latest batch of fixes