Just fixing up some small issues