Fix some small stuff