Bug fixes for hybrid part of capturabilityBarrier. Cleanup.