Fixed type conflicts