Fix type parsing