Fixes wrt. recent changes.