Still fixing server scripts