Fix clang and gcc 4.8. release build