Made some bugs disappear