ERT-538 - Small fixes.