Fix subspecs