Fixes based on feedback from today