gonk-misc from v1-train to fix compile error