KER-267: Fix some issues met while working on KER-253