Server side fixes after Task 2