Some fixes, long overdue.