More fixes to new code.