Adding some small workspace chabges