fix server file shortcomings