Cap fixes

Great job, bud!