Fixing more code damage.