couple of tiny fixes for empty and legacy data accounts
v0.1.31