Few minor bits