More changes/fixes from code review