polling and shutdown fixes for the cloud