Fixing up code.