Some final review fixes

Final review fixes