some REALLY last fixes