General - Changes to get the bundle working in production