Fixes based on NJ's feedback.