Fix counter impulses and msgs