Fix up mock appserver for new APIs