Bug fix
Minor changes