Fix ups from last pull