Some fixes for the mode w/o auto branch loading