new fixes - debug build