Fixed up commits and handled special case for phone screening commits