More zebra-style tweaks