Further fixes to make debugging/deploying easier