Fix server creation