Bugfixes in machines that haven't been touched for ages..