Fix some issues that occur when compiling with c++17 or c++20

Fix some issues that occur when compiling with c++17 or c++20 #482