Missed a *.
Fixed another couple of issues.