Fixed some small problems