Fixes from master, makes forks and utensils useful.