Fix more cranky-server problems
Merge