And now for something that should have existed for a long time, but has just arrived - is the new Lens Adjustment Tool for Raspberry Pi Camera. Simply place over the lens on your Pi Camera and you can easily adjust in both directions: