Fixes for [IRE-12] and [Booj-16]