Fix workspace saving