Fixes from feedback.