Fixed some bad cut/paste editting