Some more tiny tweaks