More bugfixes for 2 of 5