More server bug fixes
1.1.3