Fix unplanned Bugs