Cannon tweaks