Smaller tweaks