Fix some issues with fail/success