Fixed some stuff?