Much more small fixes