Fixes for problems with wrong response from API