[Misfit] Fix bugs