Fixes for arch