Make fixes based on feedback