Incorporate fixes and recommendations from evaluation