BZ-12025: Fix issues 2-3, 2-8 and 2-16