Fixing bugs in code