Minor lab time bugfixes

Change-Id: Iaa9202dd0f5d057184da34203ce222081d098e5d
Signed-off-by: Jeremy Ho <jujaga@gmail.com>