Fix a few issues with how we listen for ready