a few small changes from arch