Various tiny tweaks