Fixes wrt comments from anastasiamac