Projectkk2glider/remaining issues 1311

Consider this changes in relation to issue #1311