please fix build failures, including those introduced by GCC 5