Bug fixes for BO Form