Fixed for some errors while compiling