Fixed some more little problems