A few more small fixes.