Time to fix some bugs!