Fixed unit typing