Some more smaller changes