bomb fixes