Updates to match latest emoncms changes