Fix some stuff I broke