Ensure package is functioning in ambient mode

Need to make some small adjustments to make sure package runs and passes tests in ambient mode