More fixes to code.