Fix startup for killable builds