fixes for server render