Added wait for map server to be up...