Small updates to allow the framework to be run in console