Fix type signatures