Fixed broken commits