Initial run bug fixes.