Some fixes (targetfield).