#26
Database fixes