More tiny tweaks