more changes to make compile on arm