Indeed more small fixes