Fixing Server usage in bootstrap