Updated backend files with small minor hotfixes

Updated backend files with small minor hotfixes #79