Further updates to database encryption - now relatively stable