Address PR comments, fix cxx11 issue (#397)