Projectkk2glider/remaining issues 1311

Consider this changes in relation to issue #1311
Did you test it on !ARM boards? 9X with M128 chip for example.