Fixes #BB-683
Fix #BB-682
Fix #BB-668