Fix the compose generics