Fixes for simple.data