Removed isTokenFixed as changesets should now be used
Added fixes for some errors