Fixed some minor issues : STORM-80