Minor fix
Bug fixes