Fixed last rebase commits