Fixed some miscelaneious issues