Some fixes, still broken.