little fix

you said :
>  hopefully i i will be able to review and merge this by next week.

I can't imagine it comes so quickly ! 
so here are some fixes I don't have time to push before your next week :-)