Fix various error