Maiking some small changes