Fixes for workspace