Fix ISO C++ errors (I hope)