A couple of minor architecture tweaks