Fix more resetdefault issues found by Mark