Added Eugene's hot fixes