Add various fixes.