Fix responces, other small fixes