refs #344, fix compilation issues from merge of server-1929