Changing few files to fix errors