More android and windows persistence additions/fixes