Some missing changes for previous commit