Fix a few Cardboard Box bugs