Fixed some missed changes from stash