A few production level changes to make it all run..