Trying to fix less compiling errors