Fixes of bugs inserted in my last commit :)