Fixing BGI1 Sample Issues