Fixed some stuff for suckerpunch