WIP: better fixes for SjLj