Minor bugfixes, but I thought, what the hey?