Resolves #BB-659
Fix #BB-432
Fix #BB-454
Fix #BB-1061
Fix #BB-554
Fix #BB-487
Merge pull request #549 from gannetson/multiple-fixes

Multiple fixes