* Bunch of minor bugfixes to source and makefile
Authored by: dosadisf 2017-11-07
Parent: [r36]
Child: [r38]
