Minor Changes on basic files