Fixes to importing and Counter