Bug fixes (pachube -> xively)