last fixes for 1.7 compatibility (mostly stable)