[m12651] Fix compile issues