Final playthrough bugfixes