Fix some typos and remove some properties from copy/paste code