Fixes for Baron