Fixed all found errors