External/weak SOM fixes, branch limit corrections.