Fixes required for stackato example