[1.1] Other Changes