Fix a bunch of crash, more to come
Remove useless log
Remove buggy workaround. Wait for the workarounded bug to re-appear