last fixes for now