Small bits of cleanup