Wip sip14 bugfixes √

Fixes SI-6913
Fixes SI-6932

Makes the world a better place