Uniform tweaks