Small fixes based on feedback