Fixes from Vitalik.