A couple pre-testing fixes