Updates for manual server specification.