Changes to few paths and defaults