[653] Fixes for dodgy counting