A few more architecture tweaks