Fixing the broken commits