Some fixes, but still broken