2017 fixes

Possible fixes for http://opendayz.net/threads/2-0-worldspace-save-issu.9312/