Fixed some stuff on 1.1