Stranded B: Bug fixes

Bug fixes