Fixing those bugs!