small fixes for BCB6