Latest batch of fixes