At last some fixes that actually fix something