Chest bugfixes