assorted fixes from Gail Adler