I fixed that parts as you suggested.

(btw, do I need to provide a patch in only on commit?)