Server file fixes