Prefer server managed

Also for comment. Needs tons of tests, but..