Issues 600, 601, and apple rejection fixes

These have gone live... so it's a bit "shut the barn door"... but I needed this clean to start getting ready for 3.1.1