Fixing bugs discovered during testing