Fixes from trail on Darwin PPC: t+