Fix pushing to channels and devices