Correct types used in array (remove error/warning when compiling with C++11)