Fixes for [Booj-16], [Booj-20], [Booj-28], and [Marketing-458]