Leftovers and setup fix after merge
Merge branch 'cndoom' of https://github.com/fx02/cndoom into cndoom