Misc checkins based on discussions.