Apply exit status tweaks (TODO:fix)