Fix for #BB-693
Fix #BB-692
Fix #BB-691
Fix #BB-688 nad probably some more
Fix #BB-684