Some fixes (still broken).