TRUNK-3876: Fix things