Fix problem with XLS + Fix problem with blank branch and program Fixes #207 Fixes #192