Bugs cleanup