Some fixes
Fail-safe server added