TRUNK-2883: Fixed things