Some small changes again