Two more problems
Some changes