server: more fixes for 0.8
1.7.4