Fixes from Mark plus others I noticed