Fix missing Compose instances (TODO move)