changes made to allow build on aarch64