Server side fixes