Dummy improvment + some fixes