Fixes for Issue TOOLS-2526