bug fixes from today's commits