[FOLD] Compile Bug Fixes