Fix some errors on edit container