Committing up various fixes.