Changes to make things production ready