Fix small stuff