Fix 729 and 735 some more.