arch testing / fixes