Fixed earlier fuck-ups