Additional fixes to code.