bug fixes to baseintegrator