Another batch of fixes.