Fixing server crashes