fixes and halt on failures