Misc. architecture improvements