Some more small fixes/changes