Some minro changes