Data space stack support related fixes.