Dual mode bug fixes.

WIP