Long polling fixes -- apparently we shouldn't block :allthethings: