Minor changes, don't matter
Server is accessible by IP
Merged