Some fixes for the Chest editor