Fixed some minor changes