Actually fixed GCC warnings