GC-347 fixes from Steve and other general improvements