Fixed workspace issues