Fix some artifacts