Fixed Matthias suggestions.