Here are some more fixes:
https://github.com/tx00100xt/SE1-TSE-Sequel/commit/a1575dd41a60d524f05b6ccc94dc7...
https://github.com/tx00100xt/SE1-TSE-Sequel/commit/7cfb90ac77b721fe11c04b9812788...
https://github.com/tx00100xt/SE1-TSE-Sequel/commit/8d625ce3ecf9d5d65a2bdec754dcf...
