Fix type and build