Fixing Neil's mistakes