Just some small changes