Missing some updates that were supposed to be included in previous commit