Fix some stuff?