First batch of fixes.