5.4 source build errors

Got same problem