Fixing a couple of warnings during compiling