Fixing workspace issues