Fixes some secret token porblems