Quick changes for some broken things (most changes from old Khad's Fixes for previous Factorio version)

this fix for Xander mod version 2 (Therax fork) - not for new 3.x version of Xander