* Bugfixes brought up by @ iduhetonas