Fix workspace creation