A couple of fixes

Just making the box build again and added a couple of things I thought might be good. Feel free to cherry-pick !