Fix some errors reported