last fixes on workspace