Some updates that didn't get checked in a while back