Small fixes -- staged for Tesla test run