Bug fixes from today's lectures