Bugs rebased