Fix function types

Change-Id: I295f587e48e2882f87091a3a86610e316cd903fb