Misc updates from feedback

Fixes from feedback.