CON-980 | Some minor fixes