Fixes to code.