Some more small touches