More bugfixes

Somehow, by not bugfixing anything, I seem to have solved the problem...go figure.

Matthew:out