More fixes, still broken...