Fixes for ExBold