Fixes a couple of random defects.