Compile issue and fix for TC-804