Little fixes, current database