Fixes to is_running