Typos fixed, server completion properly detected