Apply Sven's suggestions.