Correcting some issues from the last merge conflict…