Fixed some small issues...