Updates to match javarosa dummy storage changes