Fixed minor issues :STORM-80