Fixed some code meant for production