Bomb logic fixes