various fixes from today's meeting