More singlespace to doublespace fixes.