Fixes for arm64