Remove junk code from setDefaultKey and add a couple of missing ';' and ','