my last fixes from a long time ago