Fixing new bugs