Fixes to snf-token