More fuck-ups fixed