Fix pointer types as appropriate