Fixed/mitigated issues which caused errors during production deployment