Some more small fixes.