Fixes based on feedback.