Fix found errors