Found a few bugs caused by a bug in yo