Database creation near completion, small fixes otherwise