Merging bugfixes from chocolate-doom/master

Bugfixes from chocolate-doom/master, merged into choco-plus/master