Updating variable declarations to comply with gcc-4.8