Fixing TOOLS-2481 & TOOLS-2523