wip: stack fixes

[Drakulix]

partially picked up in: https://github.com/pop-os/cosmic-comp/commit/e61a76d39ce2e9902c81b7955830fad982f797f9