Bug sweeps

Bug sweeps