[v33] Add changes for correct build on ARM