Fix warnings
Fix hang on turn / choice when receiving interrupt