Bugfixes for old stuff i forgot to bugcheck