Fixed some artifacts