Add stuff missing in the last commit