Some more small fixes