db_pwd fixes