Adjusted server and xmlreader to keep inline with lab script examples