Fixed all the broken commits