Mainframe Robustness fixes