Add some small changes