* address issues which surface with clang 6.0

* revert changes due to new clang warning and disable new warning