Add various fixes