incorporated recent loadfix changes