Fix some issues I should have check before committing the previous commit ^^'