Fixes for backup to H2 and MySQL