More cap tweaks