Javadoc fix
Database initialization fix