Fix some type signatures