Fixes to pr comments