Try to fix some weird stacks