Major Bug fixes for all failure cases