Minor fixes

Fixes several little issues that were plaguing the scheduling and Android work I did today.