Fixed types for def