Fix minor stuff