Small server side fixes.