And an other minor fix