Fix #13 and #14

I'll have a look, maybe tomorrow, today I don't have the time