Fixed issues when running the code on development