Bugfixes

Two small things that look like bugs to me, and one more ignore.