Double support turned off. Minor fixes.