Committing these from the desktop.

Couple troubleshooting maneuvers.