Bring MaxCounter and Pure up to snuff