last fixes for 292