checkins and compile fixes from James