Bugs removed