Small architecture improvements