More bugfixin'