Fixing api responses