STORM-80 : Fixed minor issues