Couple other minor changes