applied fixes from worldskills patch