Bug fixes to general.php file.