Fixes in response to Owen's feedback.