Minor fixes

Btw, very useful project! :-)