Various Fixes for Data Lab