Fixes based on feedback