Branch scaling policy
Fix various other problems