Fixed some small issues