Some fixes as to Fuco1's advices on #6