Couple quick bug fixes before demo.