Bug fixes after initial testing of PCR and AUTO hardware select changes.