Some small changes related to commit e49e03186210c7116c31f05820884503fe4de861