Some more small modifications