AE: Commit some changes that I misplace during the rebase