EST-408b: Minor bugs fixes as mentioned in 2nd comment on this ticket