Minor but important fixes

We can now count.