Some more changes, not big