bug fixes for 25 database