Fix Ctrl+C issues