Couple quick fixes