Bomb Fixes