Minor changes to run seamlessly on the lab account