Added some more fixes for arch