Fixes for HDL database.