WOrkspace fixes