Added fixes from #124 for today's build.