Resolved issues with debug build