Troubleshooting

@grosu @xiaohe27 @seriousamlqz 
Plz review