Add various minor changes