More fixes based on feedback.