some REALLY REALLY last fixes